Notify on the ::active property _here_, not in

Tue Nov 27 20:17:55 2001  Owen Taylor  <otaylor@redhat.com>
	* gtk/gtkcheckmenuitem.c (gtk_check_menu_item_activate):
	Notify on the ::active property _here_, not in
	gtk_check_menu_item_set_active.

diff --git a/ChangeLog b/ChangeLog
index 8a0e5435904611bb853f3778937a960fd4dcf4f2..67f9e0b31d992056c0dd035145d14f4dfa02446d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Nov 27 20:17:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckmenuitem.c (gtk_check_menu_item_activate):
+       Notify on the ::active property _here_, not in
+       gtk_check_menu_item_set_active.
+
 Mon Nov 26 19:11:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrendererpixbuf.c

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8a0e5435904611bb853f3778937a960fd4dcf4f2..67f9e0b31d992056c0dd035145d14f4dfa02446d 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Tue Nov 27 20:17:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckmenuitem.c (gtk_check_menu_item_activate):
+       Notify on the ::active property _here_, not in
+       gtk_check_menu_item_set_active.
+
 Mon Nov 26 19:11:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrendererpixbuf.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8a0e5435904611bb853f3778937a960fd4dcf4f2..67f9e0b31d992056c0dd035145d14f4dfa02446d 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Tue Nov 27 20:17:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckmenuitem.c (gtk_check_menu_item_activate):
+       Notify on the ::active property _here_, not in
+       gtk_check_menu_item_set_active.
+
 Mon Nov 26 19:11:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrendererpixbuf.c

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8a0e5435904611bb853f3778937a960fd4dcf4f2..67f9e0b31d992056c0dd035145d14f4dfa02446d 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Tue Nov 27 20:17:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckmenuitem.c (gtk_check_menu_item_activate):
+       Notify on the ::active property _here_, not in
+       gtk_check_menu_item_set_active.
+
 Mon Nov 26 19:11:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrendererpixbuf.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8a0e5435904611bb853f3778937a960fd4dcf4f2..67f9e0b31d992056c0dd035145d14f4dfa02446d 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Tue Nov 27 20:17:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckmenuitem.c (gtk_check_menu_item_activate):
+       Notify on the ::active property _here_, not in
+       gtk_check_menu_item_set_active.
+
 Mon Nov 26 19:11:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrendererpixbuf.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8a0e5435904611bb853f3778937a960fd4dcf4f2..67f9e0b31d992056c0dd035145d14f4dfa02446d 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Tue Nov 27 20:17:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckmenuitem.c (gtk_check_menu_item_activate):
+       Notify on the ::active property _here_, not in
+       gtk_check_menu_item_set_active.
+
 Mon Nov 26 19:11:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrendererpixbuf.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8a0e5435904611bb853f3778937a960fd4dcf4f2..67f9e0b31d992056c0dd035145d14f4dfa02446d 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Tue Nov 27 20:17:55 2001  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtkcheckmenuitem.c (gtk_check_menu_item_activate):
+       Notify on the ::active property _here_, not in
+       gtk_check_menu_item_set_active.
+
 Mon Nov 26 19:11:18 2001  Jonathan Blandford  <jrb@redhat.com>
 
        * gtk/gtkcellrendererpixbuf.c

diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index 3669304843b3a6d15c6be27a2aae2fbac901ec9b..9e57485f8a80f1a288f46d1cb8f51d81a21661e3 100644 (file)
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -204,10 +204,7 @@ gtk_check_menu_item_set_active (GtkCheckMenuItem *check_menu_item,
   is_active = is_active != 0;
 
   if (check_menu_item->active != is_active)
-     {
-       gtk_menu_item_activate (GTK_MENU_ITEM (check_menu_item));
-       g_object_notify (G_OBJECT(check_menu_item), "active");
-     }
+    gtk_menu_item_activate (GTK_MENU_ITEM (check_menu_item));
 }
 
 /**
@@ -335,6 +332,8 @@ gtk_check_menu_item_activate (GtkMenuItem *menu_item)
 
   gtk_check_menu_item_toggled (check_menu_item);
   gtk_widget_queue_draw (GTK_WIDGET (check_menu_item));
+
+  g_object_notify (G_OBJECT(check_menu_item), "active");
 }
 
 static void